Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Mon, 27 Aug 2018 10:51:44 +0000 (12:51 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Mon, 27 Aug 2018 10:51:44 +0000 (12:51 +0200)

Trivial merge